Merge tag 'upstream/2016.3'
authorSimon McVittie <smcv@debian.org>
Fri, 11 Mar 2016 08:08:06 +0000 (08:08 +0000)
committerSimon McVittie <smcv@debian.org>
Fri, 11 Mar 2016 08:08:06 +0000 (08:08 +0000)
Upstream version 2016.3


Trivial merge